new branch 1 commit
no conflict now