deep conflicts, missing resolutions