bug fixed.
merge conflict.