use utils.rb
use diffs instead of merges