Avoid merge conflict