Solve Merge Errors