Fix add bug.
I fix conflict.