Clean up comflicts