Merge conflicts merged into master?

I'll be honest, I haven't tried to build the project yet, but just started browsing the code base, and I've seen a bunch of merge conflicts were merged with this commit:

https://github.com/HexAirbot/HexNanoController_Android/commit/33f79a668645c73045865db7dae2d4b15722fd2a
