Remove Git merge artifacts from default.rb