fixed galaxy generators so that systems don't overlap
fixed merge