Remove all non existant conflicts