made some changes, changed them back, and yet git wants me to commit these changes