Fix bug.
Resolve conflict.