Avoid merge conflict.