Fix merge Derp