fix conflict resolution mistake