finished array tutorial
starting another merge conflict for learning
conflict a call replaces origin call
conflictB replaces origin call
choose conflict B
testing some xml stuff here
seems to all work, needs some refactoring