removed <<<HEAD code