MISC: Removed main.rb.orig (backup mergetool file)