fixing things after mishandling git commits