Added conflict.new