add coredata framework
add coredata model file
fix conflict