fixes some small merge issues

library.gd

@@ -1,6 +1,6 @@
 extends Node2D
 
-var _card_class = preload("res://card.gd")
+var _card_class = preload("res://scenes/card/card.gd")
 
 # Library cards are represented as an array of card IDs.
 var lib_cards: Array[String]

tabletop.gd

@@ -109,19 +109,10 @@ func _ready() -> void:
 	move_child(player, 0)
 
 	cache.get_card_data_from_name("1996 World Champion")
-<<<<<<< HEAD
 	
 	var deck = deck_input.new()
 	add_child(deck)
-	deck.add_new_deck(cards, "Blood rites")
-	
-=======
-
-	# var deck = deck_input.new(cards)
-	# add_child(deck)
->>>>>>> card-rework
-
-	pass  # Replace with function body.
+	deck.add_new_deck(cards, "Blood rites")	
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.