Cleaning up conflict