Fix merging derp