Manual fix of the merge conflict