made a change
made other changes
conflict finished
only changed this file