Fix issue #6.
Fix the conflict.