minor edits to correct some merge edits that I reverted