[DB] modfiy code .
[DB] modify conflict .