fourth commit
using theirs resolve 1
for conflict
using theirs coflict 2