fixed git mess-ups