Merge in Civi Core