outline and skeleton
Merge branch 'master', remote-tracking branch 'upstream/master'
outline and skeleton post-merge... confused