Solved Merge error