Resolve merge cruft
IAB events for android, not fully automatic, but pretty easy