Remove Git merge artifacts from default.rb

Pointed out by @sotarok: https://twitter.com/sotarok/status/439290802204721152