Update default.rb

I broke the merge :( fixing now by removing git lines and correcting.