updating core for merge