You have modified these files yourself. Do as it suggests:
by doing:
cd /var/www/html/admin git stash
and try again