updating activity main files- wonky confusion

swtiched into curtis' branch and back into master, now it won't let me
merge unless i commit these. merging to see if this solves the problem