insert on branch 1
do something on branch 2
merged 2 and reset readme
edit readme on master
resolved conflict