Get merges to compile.