Errors from the merge