locally commit
Merge branch 'master' of github.com:ThomasBush/project1
blue merge conflict
merged red and blue to purple