fix derp merge