调整button, 添加watch
resolve conflict