Fix of <<<HEAD and branch strings