merge edits to work with new challenges