removed some <<<HEAD thingy