user 1 modification
Conflic modified
merge changes to master from newBranch