Merge conflict.