register
resolve conflicts