Overcoming conflict