let users resolve conflicts