fixed the atrocity that is merge conflicting

I hate tiled.