outline and skeleton post-merge... confused