Fixed merge derpiness