second commit from user2
conflict is fixed