Coredata merge with master