by Tim Hunt.
Well, before merging or committing anything, it would have been a good idea to find out what changed.
git status
git diff
would have shown you that. If the changes were trivial, you could have removed then (git checkout badges/lib/backpacklib.php) instead of committing them.
Anyway, you got your problem solved.