... sigh :(

Sorry for the trouble. Once something goes wrong in the git history I still don't know how to fix it properly :\