diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index 48bc3abea3a6fad1d3783dfe6440e8359171324c..67069fa5d24fc72d2379b54e71e8a47b18af6622 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -6,6 +6,7 @@ dock_5_selected_tab_idx=0
 dock_floating={}
 dock_bottom=[]
 dock_closed=[]
+<<<<<<< HEAD
 <<<<<<<HEADdock_split_2=-1
 dock_split_3=0
 dock_hsplit_1=0
@@ -13,31 +14,82 @@ dock_hsplit_1=0
 dock_hsplit_3=-270
 dock_hsplit_2=270
 dock_split_2=0
+=======
+<<<<<<< HEAD
+dock_split_2=-1
+dock_split_3=0
+dock_hsplit_1=0
+<<<<<<<HEADdock_hsplit_2=498
+dock_hsplit_3=-483
+dock_hsplit_2=461
+=======
+dock_split_2=0
+dock_split_3=0
+dock_hsplit_1=0
+<<<<<<<HEADdock_hsplit_2=498
+dock_hsplit_3=-540
+dock_hsplit_2=540
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 dock_hsplit_4=0
 dock_filesystem_h_split_offset=240
 dock_filesystem_v_split_offset=0
 dock_filesystem_display_mode=0
 dock_filesystem_file_sort=0
 dock_filesystem_file_list_display_mode=1
+<<<<<<< HEAD
 dock_filesystem_selected_paths=PackedStringArray("res://scenes/screens/title_screen.tscn")
 dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://scenes/screens/", "res://assets/", "res://assets/Character Assets/")
+=======
+<<<<<<< HEAD
+dock_filesystem_selected_paths=PackedStringArray("res://assets/Resized Chess Piece Assets/White_rook.png")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://scenes/ui/", "res://scenes/screens/", "res://assets/ui/", "res://assets/ui/title_screen/")
+=======
+dock_filesystem_selected_paths=PackedStringArray("res://scenes/ui/menu_button.tscn")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/")
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 dock_3="Scene,Import"
 dock_4="FileSystem"
 dock_5="Inspector,Node,History"
 
 [EditorNode]
 
+<<<<<<< HEAD
 open_scenes=PackedStringArray("res://main.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/screens/title_screen.tscn")
 current_scene="res://scenes/screens/select_piece_screen.tscn"
 center_split_offset=-366
 selected_default_debugger_tab_idx=1
 selected_main_editor_idx=0
+=======
+<<<<<<< HEAD
+open_scenes=PackedStringArray("res://main.tscn", "res://scenes/scene_manager.tscn", "res://scenes/game.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/ui/menu_button.tscn")
+current_scene="res://main.tscn"
+center_split_offset=-274
+=======
+open_scenes=PackedStringArray("res://scenes/game.tscn")
+current_scene="res://scenes/game.tscn"
+center_split_offset=0
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+selected_default_debugger_tab_idx=0
+selected_main_editor_idx=2
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 selected_bottom_panel_item=1
 
 [ScriptEditor]
 
+<<<<<<< HEAD
 open_scripts=["res://scripts/Assassin.gd", "res://scripts/Bishop.gd", "res://scripts/game.gd", "res://scripts/King.gd", "res://scripts/Knight.gd", "res://scripts/Mage.gd", "res://scripts/main/main.gd", "res://scripts/Pawn.gd", "res://scripts/Queen.gd", "res://scripts/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd", "res://scripts/Wizard.gd"]
 selected_script="res://scripts/screens/select_piece_screen.gd"
+=======
+<<<<<<< HEAD
+open_scripts=["res://scripts/Assassin.gd", "res://scripts/game.gd", "res://scripts/main/main.gd", "res://scripts/screens/menu_button.gd", "res://scripts/Pawn.gd", "res://scripts/Piece.gd", "res://scripts/ui/pop_up_label.gd", "res://scripts/Queen.gd", "res://scripts/Rook.gd", "res://scripts/run_data/run_data.gd", "res://scripts/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd"]
+selected_script="res://scripts/main/main.gd"
+=======
+open_scripts=["res://scripts/game.gd"]
+selected_script="res://scripts/game.gd"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 open_help=[]
 script_split_offset=70
 list_split_offset=0
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
index 70c6b2d9a052d0187a53e9352618df6aaae6c344..7ca6e5bb70e3bdd742e86664ef9e6b2e7f5e6ed2 100644
--- a/.godot/editor/filesystem_cache8
+++ b/.godot/editor/filesystem_cache8
@@ -1,7 +1,14 @@
 ea4bc82a6ad023ab7ee23ee620429895
+<<<<<<< HEAD
 ::res://::1739070382
 icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1739068818::1::::<><>::
 main.tscn::PackedScene::5692118487183161714::1739070382::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
+=======
+<<<<<<< HEAD
+::res://::1739059803
+icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1738864896::1::::<><>::
+main.tscn::PackedScene::5692118487183161714::1738886824::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 README.md::TextFile::-1::1738795350::0::1::::<><>::
 ::res://assets/::1739068749
 ::res://assets/Character Assets/::1739069680
@@ -126,3 +133,123 @@ select_piece_screen.gd::GDScript::-1::1739070369::0::1::::SelectPieceScreen<>Con
 title_screen.gd::GDScript::-1::1738864872::0::1::::TitleScreen<>Control<>::
 ::res://scripts/ui/::1738804415
 pop_up_label.gd::GDScript::-1::1738804415::0::1::::<>Label<>::
+<<<<<<< HEAD
+=======
+=======
+::res://::1738784912
+icon.svg::CompressedTexture2D::6378281210119878262::1738697583::1738698231::1::::<><>::
+main.tscn::PackedScene::5692118487183161714::1738698010::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn
+README.md::TextFile::-1::1738697583::0::1::::<><>::
+::res://Assets/::1738973974
+::res://Assets/Character Assets/::1738973983
+Bishop Character.png::CompressedTexture2D::5940736122524784063::1738973983::1738974455::1::::<><>::
+Knight_Character.png::CompressedTexture2D::6219382475167814187::1738973983::1738974455::1::::<><>::
+Rook Character.png::CompressedTexture2D::4669491807804796081::1738973983::1738974455::1::::<><>::
+::res://Assets/noise/::1738785341
+noise2.tres::NoiseTexture2D::5054739835828921764::1738785341::0::1::::<><>::
+noise3.tres::NoiseTexture2D::906885015046579772::1738785341::0::1::::<><>::
+noise.tres::NoiseTexture2D::1693764769519573005::1738785341::0::1::::<><>::
+::res://Assets/Original size Chess pieces/::1738698231
+Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738697583::1738698231::1::::<><>::
+Black knight piece.png::CompressedTexture2D::4196515762256027844::1738697583::1738698231::1::::<><>::
+Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1738697583::1738698231::1::::<><>::
+Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1738697583::1738698231::1::::<><>::
+Black rook piece.png::CompressedTexture2D::1872655759582013005::1738697583::1738698231::1::::<><>::
+White king piece 2.png::CompressedTexture2D::7139286146806283259::1738697583::1738698231::1::::<><>::
+White knight piece.png::CompressedTexture2D::8293368904171920332::1738697583::1738698231::1::::<><>::
+White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1738697583::1738698231::1::::<><>::
+White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1738697583::1738698231::1::::<><>::
+White rook piece.png::CompressedTexture2D::6272641373813891014::1738697583::1738698231::1::::<><>::
+::res://Assets/Resized Chess Piece Assets/::1738785332
+Black_Assassin.png::CompressedTexture2D::8073890137727350160::1738785199::1738785332::1::::<><>::
+Black_Bishop.png::CompressedTexture2D::460446186536534245::1738785199::1738785332::1::::<><>::
+Black_king.png::CompressedTexture2D::4854362018128016652::1738785199::1738785332::1::::<><>::
+Black_knight.png::CompressedTexture2D::1617611918054521687::1738785199::1738785332::1::::<><>::
+Black_mage.png::CompressedTexture2D::2920003665923805930::1738785199::1738785332::1::::<><>::
+Black_Pawn.png::CompressedTexture2D::2619567017608544670::1738785199::1738785332::1::::<><>::
+Black_Queen.png::CompressedTexture2D::6947892130764941861::1738785199::1738785332::1::::<><>::
+Black_rook.png::CompressedTexture2D::8764665212117114244::1738785199::1738785332::1::::<><>::
+Black_wizard.png::CompressedTexture2D::5486342020773449925::1738785199::1738785332::1::::<><>::
+White_Assassin.png::CompressedTexture2D::3263768232109514548::1738785199::1738785332::1::::<><>::
+White_Bishop.png::CompressedTexture2D::2601047089659819063::1738785199::1738785332::1::::<><>::
+White_king.png::CompressedTexture2D::5585160899749004797::1738785199::1738785332::1::::<><>::
+White_knight.png::CompressedTexture2D::1766720508600943431::1738785199::1738785332::1::::<><>::
+White_mage.png::CompressedTexture2D::902301787075014336::1738785199::1738785332::1::::<><>::
+White_Pawn.png::CompressedTexture2D::1597566599437225196::1738785199::1738785332::1::::<><>::
+White_Queen.png::CompressedTexture2D::172918419201557125::1738785199::1738785332::1::::<><>::
+White_rook.png::CompressedTexture2D::5685989093237609766::1738785199::1738785332::1::::<><>::
+White_wizard.png::CompressedTexture2D::3041081003801605884::1738785199::1738785332::1::::<><>::
+::res://Assets/shaders/::1738785340
+3d_effect.gdshader::Shader::-1::1738698010::0::1::::<><>::
+bg.gdshader::Shader::-1::1738785340::0::1::::<><>::
+color.gdshader::Shader::-1::1738698010::0::1::::<><>::
+shadow.gdshader::Shader::-1::1738698010::0::1::::<><>::
+::res://Assets/sprites/::1738698231
+bishop.png::CompressedTexture2D::4631301773944929250::1738698010::1738698231::1::::<><>::
+knight.png::CompressedTexture2D::3545640967717948854::1738698010::1738698231::1::::<><>::
+pawn.png::CompressedTexture2D::1338760335342038528::1738698010::1738698228::1::::<><>::
+rook.png::CompressedTexture2D::6790909281007670776::1738698010::1738698228::1::::<><>::
+tile.png::CompressedTexture2D::8704336058451696509::1738698010::1738698228::1::::<><>::
+::res://Assets/temp_assets/::1738698229
+assassin.png::CompressedTexture2D::2309680507621369322::1738698010::1738698228::1::::<><>::
+black_bishop.png::CompressedTexture2D::7509881182472568151::1738698010::1738698228::1::::<><>::
+black_king.png::CompressedTexture2D::3646032776351028361::1738698010::1738698228::1::::<><>::
+black_knight.png::CompressedTexture2D::4591257172048987833::1738698010::1738698229::1::::<><>::
+black_pawn.png::CompressedTexture2D::3912668014183198267::1738698010::1738698229::1::::<><>::
+black_queen.png::CompressedTexture2D::7989886812523566234::1738698010::1738698229::1::::<><>::
+black_rook.png::CompressedTexture2D::8767708966549765967::1738698010::1738698229::1::::<><>::
+mage.png::CompressedTexture2D::4650471376600460963::1738698010::1738698229::1::::<><>::
+Piece_move.png::CompressedTexture2D::260618725614842917::1738698010::1738698229::1::::<><>::
+temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738698010::1738698229::1::::<><>::
+turn-black.png::CompressedTexture2D::7112033964315790810::1738698010::1738698229::1::::<><>::
+turn-white.png::CompressedTexture2D::7344907768700758025::1738698010::1738698229::1::::<><>::
+white_bishop.png::CompressedTexture2D::8093744356261485644::1738698010::1738698229::1::::<><>::
+white_king.png::CompressedTexture2D::5901183203660598461::1738698010::1738698229::1::::<><>::
+white_knight.png::CompressedTexture2D::7533630084821562912::1738698010::1738698229::1::::<><>::
+white_pawn.png::CompressedTexture2D::8196778834906249875::1738698010::1738698229::1::::<><>::
+white_queen.png::CompressedTexture2D::1957958042777204643::1738698010::1738698229::1::::<><>::
+white_rook.png::CompressedTexture2D::3317152307554436932::1738698010::1738698229::1::::<><>::
+wizard.png::CompressedTexture2D::2759604866355024615::1738698010::1738698229::1::::<><>::
+::res://Assets/ui/::1738698232
+Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738698010::1738698232::1::::<><>::
+Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738698010::1738698231::1::::<><>::
+Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738698010::1738698231::1::::<><>::
+::res://Assets/ui/title_screen/::1738698229
+play_button.png::CompressedTexture2D::5896995890187459238::1738698010::1738698229::1::::<><>::
+quit_button.png::CompressedTexture2D::5172428563227279585::1738698010::1738698229::1::::<><>::
+rules_button.png::CompressedTexture2D::8060955005205795067::1738698010::1738698229::1::::<><>::
+::res://scenes/::1738787758
+Assassin.tscn::PackedScene::1241611789899982875::1738786130::0::1::::<><>::res://scripts/Assassin.gd<>uid://753dogr1moxe::::res://assets/temp_assets/assassin.png
+Bishop.tscn::PackedScene::2789588702038144760::1738786614::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png
+explosion.tscn::PackedScene::69466253159940830::1738698010::0::1::::<><>::
+game.tscn::PackedScene::8577524005707705072::1738787758::0::1::::<><>::res://scripts/game.gd<>res://assets/shaders/bg.gdshader<>uid://yeqb8ndri7xp::::res://Assets/noise/noise.tres<>uid://ceas3dsjeq4ge::::res://Assets/noise/noise2.tres<>uid://m6ki73qfbp2s::::res://Assets/noise/noise3.tres
+King.tscn::PackedScene::8277830396459966414::1738698010::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png
+Knight.tscn::PackedScene::5270730075267457303::1738698010::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png
+Mage.tscn::PackedScene::10334063134713649::1738786984::0::1::::<><>::res://scripts/Mage.gd<>uid://b7iyt4iwjbtd0::::res://assets/temp_assets/mage.png
+Pawn.tscn::PackedScene::3675784333675896641::1738787755::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png
+Queen.tscn::PackedScene::7495869360053814603::1738698010::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png
+Rook.tscn::PackedScene::9162401199636684468::1738698010::0::1::::<><>::uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
+scene_manager.tscn::PackedScene::6243365322716451430::1738698010::0::1::::<><>::res://scripts/scene_manager.gd
+texture_holder.tscn::PackedScene::594714386286134588::1738698010::0::1::::<><>::
+title_screen.tscn::PackedScene::8154710134031658440::1738698010::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
+Wizard.tscn::PackedScene::6352212773395470747::1738787495::0::1::::<><>::res://scripts/Wizard.gd<>uid://bfk1j3brcknkp::::res://assets/temp_assets/wizard.png
+::res://scenes/ui/::1738698010
+menu_button.tscn::PackedScene::3297943059633979218::1738698010::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd
+::res://scripts/::1738698010
+Assassin.gd::GDScript::-1::1738698010::0::1::::Assassin<>Piece<>::
+Bishop.gd::GDScript::-1::1738698010::0::1::::Bishop<>Piece<>::
+game.gd::GDScript::-1::1738698010::0::1::::game<>Node<>::
+King.gd::GDScript::-1::1738698010::0::1::::King<>Piece<>::
+Knight.gd::GDScript::-1::1738698010::0::1::::Knight<>Piece<>::
+Mage.gd::GDScript::-1::1738698010::0::1::::Mage<>Piece<>::
+Pawn.gd::GDScript::-1::1738698010::0::1::::Pawn<>Piece<>::
+Piece.gd::GDScript::-1::1738698010::0::1::::Piece<>Node2D<>::
+Queen.gd::GDScript::-1::1738698010::0::1::::Queen<>Piece<>::
+Rook.gd::GDScript::-1::1738698010::0::1::::Rook<>Piece<>::
+scene_manager.gd::GDScript::-1::1738698010::0::1::::<>Node<>::
+Wizard.gd::GDScript::-1::1738698010::0::1::::Wizard<>Piece<>::
+::res://scripts/title_screen/::1738698010
+menu_button.gd::GDScript::-1::1738698010::0::1::::TitleButton<>Button<>::
+title_screen.gd::GDScript::-1::1738698010::0::1::::TitleScreen<>Control<>::
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
index 249b19b71bfe9c0f5f710f596d87ef29398e6847..4e02d82daf86aa755f1a90b7f162a7cd18487670 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 res://scenes/game.tscn
+=======
+<<<<<<< HEAD
+res://main.tscn
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 res://assets/shaders/bg.gdshader
 res://assets/noise/noise.tres
 res://assets/noise/noise2.tres
@@ -8,4 +13,20 @@ res://scenes/Bishop.tscn
 res://scenes/Assassin.tscn
 res://scenes/screens/select_piece_screen.tscn
 res://scripts/screens/select_piece_screen.gd
+<<<<<<< HEAD
 res://scenes/screens/title_screen.tscn
+=======
+res://scripts/run_data/run_data.gd
+=======
+res://scripts/Assassin.gd
+res://scripts/game.gd
+res://scenes/game.tscn
+res://assets/shaders/bg.gdshader
+res://Assets/noise/noise.tres
+res://Assets/noise/noise2.tres
+res://Assets/noise/noise3.tres
+res://scripts/Mage.gd
+res://scripts/Wizard.gd
+res://scripts/Bishop.gd
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
index 17d58d5b59c20b6d688dbb9cf1e54058bec0b710..2394e2f0ddee59b71eaf03e1cb1d196ef3dbb207 100644
--- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
+++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -175,4 +175,12 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
+<<<<<<< HEAD
 selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Main")])
+=======
+<<<<<<< HEAD
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Main")])
+=======
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16894/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9280/@VSplitContainer@9102/@HSplitContainer@9104/@HSplitContainer@9106/@Control@9107/@SubViewportContainer@9108/@SubViewport@9109/Game")])
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index 4108a93f2cb2debce2c5c05e969b0d0b2f523a77..c1c957c6edd90cfe05842533167ea7b6bedba4d7 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -6,6 +6,7 @@ use_advanced_connections=false
 [dialog_bounds]
 
 <<<<<<<HEADcreate_new_node=Rect2(2145, 197, 900, 700)
+<<<<<<< HEAD
 <<<<<<<HEADproject_settings=Rect2(1290, 76, 1590, 867)
 create_new_node=Rect2(2379, 158, 1118, 721)
 project_settings=Rect2(2280, 190, 1200, 700)
@@ -18,3 +19,31 @@ scripts=["res://scripts/screens/title_screen.gd", "res://scripts/screens/select_
 [script_setup]
 
 last_selected_language="GDScript"
+=======
+<<<<<<< HEAD
+project_settings=Rect2(1290, 76, 1590, 867)
+create_new_node=Rect2(510, 264, 1613, 885)
+
+[recent_files]
+
+scenes=["res://scenes/ui/menu_button.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/game.tscn", "res://scenes/scene_manager.tscn", "res://main.tscn", "res://scenes/title_screen.tscn", "res://scenes/Pawn.tscn", "res://scenes/Assassin.tscn"]
+scripts=["Array", "res://scripts/screens/menu_button.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/Rook.gd", "res://scripts/Piece.gd", "res://scripts/Assassin.gd", "res://scripts/main/main.gd", "res://scripts/run_data/run_data.gd", "res://scripts/title_screen/title_screen.gd", "res://scripts/Pawn.gd"]
+
+[script_setup]
+
+last_selected_language="GDScript"
+=======
+project_settings=Rect2(2022, 76, 1590, 867)
+editor_settings=Rect2(706, 197, 900, 700)
+
+[recent_files]
+
+scenes=["res://scenes/game.tscn"]
+scripts=["res://scripts/game.gd"]
+
+[color_picker]
+
+picker_shape=3
+recent_presets=PackedColorArray(0, 0.84937, 0.111819, 1, 0, 0.417456, 0.0325145, 1, 0.104888, 0.123405, 0.154273, 1)
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index 06a8e5b85321be4fa39ba4af80242bdbd6ffd39a..59f4caeb9a7f22bb20817462e1911c0d1f932837 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -3,6 +3,7 @@
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
+<<<<<<< HEAD
 "column": 24,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
@@ -22,6 +23,14 @@ state={
 "h_scroll_position": 0,
 "row": 0,
 "scroll_position": 0.0,
+=======
+<<<<<<< HEAD
+"column": 36,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 365,
+"scroll_position": 366.0,
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -174,8 +183,34 @@ state={
 "column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
+<<<<<<< HEAD
 "row": 0,
 "scroll_position": 0.0,
+=======
+"row": 40,
+"scroll_position": 27.0,
+"selection": false,
+"syntax_highlighter": "GDScript"
+}
+
+[res://scripts/screens/menu_button.gd]
+
+state={
+"bookmarks": PackedInt32Array(),
+"breakpoints": PackedInt32Array(),
+"column": 18,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 54,
+"scroll_position": 41.0,
+=======
+"column": 0,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 147,
+"scroll_position": 147.0,
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
index 0baf76cfef5ad0015e277b24efb239104fb0d7a1..17f6d49d979399693ff8986586ce27725e0049ba 100644
--- a/.godot/global_script_class_cache.cfg
+++ b/.godot/global_script_class_cache.cfg
@@ -53,12 +53,21 @@ list=Array[Dictionary]([{
 "language": &"GDScript",
 "path": "res://scripts/Rook.gd"
 }, {
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 "base": &"Control",
 "class": &"SelectPieceScreen",
 "icon": "",
 "language": &"GDScript",
 "path": "res://scripts/screens/select_piece_screen.gd"
 }, {
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 "base": &"Button",
 "class": &"TitleButton",
 "icon": "",
@@ -69,7 +78,15 @@ list=Array[Dictionary]([{
 "class": &"TitleScreen",
 "icon": "",
 "language": &"GDScript",
+<<<<<<< HEAD
 "path": "res://scripts/screens/title_screen.gd"
+=======
+<<<<<<< HEAD
+"path": "res://scripts/screens/title_screen.gd"
+=======
+"path": "res://scripts/title_screen/title_screen.gd"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 }, {
 "base": &"Piece",
 "class": &"Wizard",
diff --git a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
index a7f9c0c540e4d928fc8fff70a31bd37a8f7e4c71..f2e794ada89bd3b120eb5e781a74d9d25d7d977a 100644
--- a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://c83ut3xxvkahs"
 path="res://.godot/imported/Black_Assassin.png-9779f11d14d3617e840d68f6a9ebb5d0.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://cjc7sh4hfoqt3"
+path="res://.godot/imported/Black_Assassin.png-9779f11d14d3617e840d68f6a9ebb5d0.ctex"
+=======
+uid="uid://dnbb15l282cpc"
+path="res://.godot/imported/Black_Assassin.png-92f0801c336ab61369a2b93fc5e3abcd.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
index 4001dad56362fc1d090c117a4fbf3bfc04665cc3..92001dce0fd86e9a10bd86cbca5c8761a78844b6 100644
--- a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://diyxdsthua4oe"
 path="res://.godot/imported/Black_Bishop.png-31156db37595e69ca512c38698f9a239.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://cmportfufw0sc"
+path="res://.godot/imported/Black_Bishop.png-31156db37595e69ca512c38698f9a239.ctex"
+=======
+uid="uid://gtbqmr0ges3f"
+path="res://.godot/imported/Black_Bishop.png-dfabfc0c81260272c753c7f344c2996a.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
index 13fc645f6090afbe517ee2b581ebeea136b225da..5f2467b8cb4e144ce43799f48d72cf650e2c984e 100644
--- a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://ccab1bkfpdh4w"
 path="res://.godot/imported/Black_Pawn.png-c1035123434d941739e8a31659fe845d.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://ccqn4arw41esa"
+path="res://.godot/imported/Black_Pawn.png-c1035123434d941739e8a31659fe845d.ctex"
+=======
+uid="uid://bdk65ejtf6ygk"
+path="res://.godot/imported/Black_Pawn.png-73ec9504aa6a8628b0708bd600099243.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_Queen.png.import b/Assets/Resized Chess Piece Assets/Black_Queen.png.import
index 28d0222381db70d090fb8d50dcbfc3e13844200f..3d349df23e78ffc8767a64ba43e1e384bbd6f2f9 100644
--- a/Assets/Resized Chess Piece Assets/Black_Queen.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Queen.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://fffv0rfu0q7c"
 path="res://.godot/imported/Black_Queen.png-91c924908a298cebe9bc2bdd61cd1aab.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://d13pkit0yx8w1"
+path="res://.godot/imported/Black_Queen.png-91c924908a298cebe9bc2bdd61cd1aab.ctex"
+=======
+uid="uid://c58u1efa4tny0"
+path="res://.godot/imported/Black_Queen.png-129070e6a0ddc5f7ae2bf0cc746c3d32.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_king.png.import b/Assets/Resized Chess Piece Assets/Black_king.png.import
index 5ef541aded4eeec6af1fb12bd41a916ea282368c..76c86c8f92bb76b3cfdfeeb5a54e9c80db31d6ca 100644
--- a/Assets/Resized Chess Piece Assets/Black_king.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_king.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://s6aop51xfemj"
 path="res://.godot/imported/Black_king.png-64de782c258a02d199067831bbfebfe0.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://bsuewqxoi3kxe"
+path="res://.godot/imported/Black_king.png-64de782c258a02d199067831bbfebfe0.ctex"
+=======
+uid="uid://cbfqvr8t31fu7"
+path="res://.godot/imported/Black_king.png-dbd93650975809023d5051fb7e838887.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_knight.png.import b/Assets/Resized Chess Piece Assets/Black_knight.png.import
index f3b3c96d936e444d3b997291cacc2c4979baa723..55dc55807798cdcc631ad733e1d629ac9532d013 100644
--- a/Assets/Resized Chess Piece Assets/Black_knight.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_knight.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bc5brk7x4t760"
 path="res://.godot/imported/Black_knight.png-846a36a9b55a92a0bd2e4692a89d9222.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://bq4h60chg048p"
+path="res://.godot/imported/Black_knight.png-846a36a9b55a92a0bd2e4692a89d9222.ctex"
+=======
+uid="uid://xbt3j0eqlab4"
+path="res://.godot/imported/Black_knight.png-929454b56153273c352ed40512756608.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_mage.png.import b/Assets/Resized Chess Piece Assets/Black_mage.png.import
index df7e9465a264bb3339558499747e80aab3be1290..ba62c55b50a8f8554c01f895378425c22a07c068 100644
--- a/Assets/Resized Chess Piece Assets/Black_mage.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_mage.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://c7ww1mqqwmyed"
 path="res://.godot/imported/Black_mage.png-7a41e4577f14b778296718d2c9942c5c.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://bnat6bynu44je"
+path="res://.godot/imported/Black_mage.png-7a41e4577f14b778296718d2c9942c5c.ctex"
+=======
+uid="uid://bhuqbfa5s6yuk"
+path="res://.godot/imported/Black_mage.png-f47f7e890ef040a98dd73453a681ffe1.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_rook.png.import b/Assets/Resized Chess Piece Assets/Black_rook.png.import
index 17fac04a2c20a5e1a7f4d6ade3828c131952d6c2..a5c6c8c153aac993e4973153b6a13b8ea5cdf004 100644
--- a/Assets/Resized Chess Piece Assets/Black_rook.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_rook.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://boc1kms28eeem"
 path="res://.godot/imported/Black_rook.png-70e1d5eb566b78612ae78261e7f5d5a6.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://cmlbpctuqkr3u"
+path="res://.godot/imported/Black_rook.png-70e1d5eb566b78612ae78261e7f5d5a6.ctex"
+=======
+uid="uid://dw4w0xmtfft4g"
+path="res://.godot/imported/Black_rook.png-b128d49fd31d80383e68d3d654f74445.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/Black_wizard.png.import b/Assets/Resized Chess Piece Assets/Black_wizard.png.import
index e3e7d9b0680ee17da5edafa6fda7387ba3aa4653..a5bedeadc076681d843d8cf6b286243bc7f45f5e 100644
--- a/Assets/Resized Chess Piece Assets/Black_wizard.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_wizard.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://g3l7llk1bf0w"
 path="res://.godot/imported/Black_wizard.png-cb555143bb3a98fb848f99dcfe765549.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://shl6jsfvn0ta"
+path="res://.godot/imported/Black_wizard.png-cb555143bb3a98fb848f99dcfe765549.ctex"
+=======
+uid="uid://ckfvis0v68irl"
+path="res://.godot/imported/Black_wizard.png-0afea0808b6267d98cbfc8507751a05e.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_Assassin.png.import b/Assets/Resized Chess Piece Assets/White_Assassin.png.import
index 3d51f275397113a7649faec4e01502c33de0ea23..52b868957873ca8e9a51e0d4dee2987c1d3b968f 100644
--- a/Assets/Resized Chess Piece Assets/White_Assassin.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Assassin.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://b24dojprangcr"
 path="res://.godot/imported/White_Assassin.png-07ca33a1945b47ebea515fea105e20ee.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://j8hhxry8f0ii"
+path="res://.godot/imported/White_Assassin.png-07ca33a1945b47ebea515fea105e20ee.ctex"
+=======
+uid="uid://bmq81ysump1xg"
+path="res://.godot/imported/White_Assassin.png-b91d29cfa010c3f963e5fe98fea3f7ce.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_Bishop.png.import b/Assets/Resized Chess Piece Assets/White_Bishop.png.import
index 4c46694fe069fe175bae2b9a86d65d800d36c4c5..9fc147e2fe09c59d390bf79a392cac29347f0303 100644
--- a/Assets/Resized Chess Piece Assets/White_Bishop.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Bishop.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://rubnu2rwm76q"
 path="res://.godot/imported/White_Bishop.png-955d7c5de349d5f940adee703d5f794f.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://buolh1uof3bbc"
+path="res://.godot/imported/White_Bishop.png-955d7c5de349d5f940adee703d5f794f.ctex"
+=======
+uid="uid://bdb74otsib8ql"
+path="res://.godot/imported/White_Bishop.png-7213de7b15a92e5747f2331d55eafa2b.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_Pawn.png.import b/Assets/Resized Chess Piece Assets/White_Pawn.png.import
index 0df1d08c8c55525c1e2a43b945fc6f74a3c67b10..f3d5880dd56ca2b415a240b8d560d194d8684861 100644
--- a/Assets/Resized Chess Piece Assets/White_Pawn.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Pawn.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://jenht75dkwpv"
 path="res://.godot/imported/White_Pawn.png-a927ba07461adabe83c8ff13a8982486.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://ndi1e8thkonq"
+path="res://.godot/imported/White_Pawn.png-a927ba07461adabe83c8ff13a8982486.ctex"
+=======
+uid="uid://w04xn5hy44qq"
+path="res://.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_Queen.png.import b/Assets/Resized Chess Piece Assets/White_Queen.png.import
index a2fc06473e959ad41c21deb796c2a56e9aa1d8b9..f4c3967edbd8848515a84655bc69db684b003f36 100644
--- a/Assets/Resized Chess Piece Assets/White_Queen.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Queen.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cg4cxk4tkibra"
 path="res://.godot/imported/White_Queen.png-a669898b0c5a31bf072c0c8c1df1616f.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://cb3vq168iyomb"
+path="res://.godot/imported/White_Queen.png-a669898b0c5a31bf072c0c8c1df1616f.ctex"
+=======
+uid="uid://cp0686asvj0h"
+path="res://.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_king.png.import b/Assets/Resized Chess Piece Assets/White_king.png.import
index d960d0912ca38f2175f158220d45d12cf701f767..d0dc5fe35ab3e739623dfe4e81845358ce818a14 100644
--- a/Assets/Resized Chess Piece Assets/White_king.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_king.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bc4si5phvljsq"
 path="res://.godot/imported/White_king.png-0d53fbc8f540b7f9892862e16f4557f5.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://cdogixbq8ay3t"
+path="res://.godot/imported/White_king.png-0d53fbc8f540b7f9892862e16f4557f5.ctex"
+=======
+uid="uid://cltq1wk8w0s02"
+path="res://.godot/imported/White_king.png-c9b2bce7af3c06b61d26520db25cf997.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_knight.png.import b/Assets/Resized Chess Piece Assets/White_knight.png.import
index ecd7254a03ced218f60210c523b44751969627bb..933528ec79f27c23beae8e9c0de2b346433c9919 100644
--- a/Assets/Resized Chess Piece Assets/White_knight.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_knight.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://c8inpm885j661"
 path="res://.godot/imported/White_knight.png-af5b60f24c1f66b5bac879aef8e75467.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://mf4a3jclbwih"
+path="res://.godot/imported/White_knight.png-af5b60f24c1f66b5bac879aef8e75467.ctex"
+=======
+uid="uid://0f2vmyxb7sh8"
+path="res://.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_mage.png.import b/Assets/Resized Chess Piece Assets/White_mage.png.import
index bf72a6d42c5a84fa5ab43b56a002137e7cb17e4e..b9786e531fd93b316f1c070c53463a11dde39e3e 100644
--- a/Assets/Resized Chess Piece Assets/White_mage.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_mage.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://d0pvdk6lfxyyr"
 path="res://.godot/imported/White_mage.png-13bf07fba853ef5731085aacccb3bab2.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://dbrrvccmlyblq"
+path="res://.godot/imported/White_mage.png-13bf07fba853ef5731085aacccb3bab2.ctex"
+=======
+uid="uid://m4c1qckexo7q"
+path="res://.godot/imported/White_mage.png-fdbd721bd126c3ac8c64372cf709b530.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_rook.png.import b/Assets/Resized Chess Piece Assets/White_rook.png.import
index 9929420a63fdb03875e0773ba82d1779699eba70..28e0a8a4c92dd0cd028998860814bd4040e9ce3c 100644
--- a/Assets/Resized Chess Piece Assets/White_rook.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_rook.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cjl7hyf15yeiv"
 path="res://.godot/imported/White_rook.png-e5e1a20ca93a0594be5d3fb1267367d2.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://b00wxxfjk04ke"
+path="res://.godot/imported/White_rook.png-e5e1a20ca93a0594be5d3fb1267367d2.ctex"
+=======
+uid="uid://cnaln6sgju27k"
+path="res://.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }
diff --git a/Assets/Resized Chess Piece Assets/White_wizard.png.import b/Assets/Resized Chess Piece Assets/White_wizard.png.import
index 80aee8689fe41dbde186483a8dcd7219a5fca949..e045543caf89c0b5a435a7a30fc07bef84c1daa0 100644
--- a/Assets/Resized Chess Piece Assets/White_wizard.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_wizard.png.import	
@@ -2,8 +2,18 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://d01b3260cqyhb"
 path="res://.godot/imported/White_wizard.png-c84194d9805542fd48d5428ec5a721ef.ctex"
+=======
+<<<<<<< HEAD
+uid="uid://dwo5k5y02pe46"
+path="res://.godot/imported/White_wizard.png-c84194d9805542fd48d5428ec5a721ef.ctex"
+=======
+uid="uid://bjlefo01b774s"
+path="res://.godot/imported/White_wizard.png-17abee749f8f28c0cac280088ae22bc1.ctex"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+>>>>>>> b7ae583c58004f02b7ab63bb8c7f9346804b776b
 metadata={
 "vram_texture": false
 }