cleaning conflict files from merge <<<HEAD