CoreData project
commit
solve conflict
commit
commit