Merge "Remove invalid error message in the merge path."