follow up for edit conflicts