Fixing conflicts in code

Getting rid of all those annoying <<<<<<< HEAD things