Removed openssl-nonblock, as it is no longer necessary
Fix merge conflict in Gemfile