Fix logical merge conflict