user2 commit
user2 second commit
merge resolution