whoops, git mv's fucked up when i did reset hard