commit to make a conflict by user2
trying to get a merge message