user1 commit same line change as user2, conflict?