Trying to Git myself out of a mess