Update Merge Errors