Merge conflict missed in last commit