Delete conflicted main.rb