cleaning up errors and conflicts