Fix the merge screw-up