Fix bug.
fix merge conflict.