remove User from coredata model
resolve conflicts