Fix merging Derp