git wanted to merge but explosion and merge conflict, I'm already standing on two legs again, luckly