resolve conflict with Mungo's merge