Fix tiny conflict derp