user1 edited conflict file