Removed accindental <<<HEAD keyword