minor fix after merge conflict