Missed a conflict on merge