we have the solved conflicts