Adding base entities
 resolving conflicts