Fixing conflict.