Fix merge conflict resolution mistake