edited conflict