fixed a merge conflict that caused crash