hints
resolve conflicts