conflict branch 2 commit