Commiting in master
Commitint to branch
Trying to create a conflict
Merge remote-tracking branch 'origin/DevelopAFile'