minor.
fixed merge conflict.