You're right. It is fixed now. I've also solved merge conflicts and squashed everything again.