Added merge driver "ours" to global config.