fixed merge conflict
first line makes more sense