Locale admin resolved merge conflicts