commit before upstream merge
Merge remote-tracking branch 'upstream/master'
more helpers
solved conflict
t push origin masterMerge branch 'michaelbyrd-master'