Minor amendment.
Fix a conflict.