commit 1
commit 2
resove conflic