Fix merging derp #2