Load merge.conflictstyle setting from config