-index file html there conflict not resolved by the last commit
-index file html there conflict not resolved by the last commit