Fixed merging stuff

Ugh, apparently we can’t have 2 people working on it at the same time.