Fixed merge errors

Merging is so annoying