missed a conflict, fixed it