Temporary fix for puma.rb Rename .env.dev Fix more merge conflicts Dev env runs and tests run (with fails)