Git Error

• Committing is not possible because you have unmerged files:

git status
git rm ../Tested/CH554/CH554-CDC-motor/CDC-motor-1.uvgui.Administrator 
git commit -m 'fix'
git push