Tom: delete plus()
Tom: clear conflict