change on feature1
change on feature1
edit c in master
edit c again in master
resolved conflict