Forcing a merge conflict.