branch
feature1
master change
conflict fixed