This should make it easier to merge conflicts and review pull requests than using the binary APKG format.
