Trying to fix the conflict.