fix merging derp