[HG] fix merges.