hand merge edits from PR