smacker: resolve conflicts