file edited on feature1
changes made in master
Merge remote-tracking branch 'origin/feature1'