Adding pry to the project
Fixing merge conflicts