fixed my git mess-ups