Fixing the conflict.