try to fix conflicts in gemfile.lock and fog.rb files / installed asset_sync