first test2 commit
second test2 commit
conflicts resolved