btw, this time I did a conflict resolve on github — bad idea 🙂