git is unhappy...