some conflicts in files failed to get resolved ( <<<<<<< HEAD marking remained in file)