Helmut was here ...
finaly  noticed that I need to commit befor pushing ( the button )
merging
completing merge for helmut
Update default.rb

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