Well... Can it be fixed? Or should we merge it this way and then fix it on another branch? (just kidding!)