Remove entirely redundant and annoying CONFLICTS