Merge error resolved