user1 commit conflict test