Fixes the syndicate shuttle

And hopefully works properly now with merging!