Failed to resolve all conflicts in the prior merge.