Fix a conflict.