Merge branch 'master' of C:\Github\projects with conflicts.
Merge remote-tracking branch 'origin/master'
Sound  Effect 2.0
Merge remote-tracking branch 'origin/master'