Trying to push staging master
fixing merge conflict
adding gemfile.lock