changed a file on branch
Changed the master branch
edited master to remove conflict