Resolve Gemfile.lock conflicts
Hide secrets