Changed style.
fixed merge conflict.