Coredata model intermediate commit
Conflicts fixed