For example you have conflict:

release/1.0 release/1.1
Foo Bar

According mode, one of four outcome available:

KEEP_OLDER KEEP_NEWER MERGE_NEWER_TOP MERGE_OLDER_TOP
Foo Bar Bar
Foo		 Foo
Bar