Fix after merge conflict