add the apk, but to a spot that wont cause merge conflicts