first remote commit
commit a conflict in the master
done
done
commit 3 file