Correct a merge error leading to build failure