git flipped a bitch on a merge, but I think I fixed it