Add atomic conflict places detection for three-way-merge.