conflict resolves