defined冲突修改