Fix: remove <<<< HEAD line