added branch line
commit with conflict
removed conflict
changed to my master code