Solved Merge errors