fix: for some reason my merge wasn't complete and <<<HEAD was left in