can't pull without merging. lets hope this works
starling added commit
current code merge 3:32PM, 07/27