finish user classification
resolve conflicts