hopefully un-yuckify the git mess I just created