softtech-exercise Repo made for exercises We resolved the conflict! Edited again in master branch! Hello, again! Now let's use Git Bash Git bash changes resolved New branch hype!!