Making a merge conflict.