Removed ruby-mode, fixing tabs
Conflict resolution