Fix git derp, and remove tag conflict