resolve conflicts and change configuration