Fix a missed merge conflict and fix a poorly resolved earlier merge conflict.