changing merge conflict on master
modified merge conflicts in branch