fixes another merge conflict, my bad!