ugh git messed up again