changes on new via new_branch
commit from master
another commit from my_own branch
using theirs