edits from am session
fixing merge conflict