unsure what these changes were, done at around 4am
Fix merge conflicts