Code Editor : conflict.rb