Compromise after conflict