git rm files
git rm extra files, conflicts solved.