Fix these stupid merge errors

Fix the stupid merge error so it can compile.