Merge Errors resolve