Missed a conflict resolution, I guess