version.rb merge=ours