sync
sync again
create second file
add second file
resolved merge conflict
add the third file
implement feature 2
implement feature 2
some work on master
merge feature2