added labels generation
conflict resolution