Shifty method to prevent as many merge errors but diff apk