Edited conflict