Boosting upstream version -- no actual changes in binary files + removing conflicts

* Boosting upstream version -- no actual changes in binary files
* Removing conflicts enforcing identical upstream version