-creating a merge conflict
-fixing merge conflict
Merge branch 'master' of https://github.com/gameDevPrep/PaddleGame.git
-merge
Merge remote-tracking branch 'origin/master'