diff --git a/better bat.tscn b/better bat.tscn
new file mode 100644
index 0000000..e8fa704
--- /dev/null
+++ b/better bat.tscn	
@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=3 uid="uid://cxfb6f5emeeoo"]
+
+[ext_resource type="PackedScene" uid="uid://xyss1dae808n" path="res://assets/models/bat/scene.gltf" id="1_ncase"]
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_imkf1"]
+radius = 1.0
+
+[node name="Bat" type="Area3D" groups=["Hazard"]]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("SphereShape3D_imkf1")
+
+[node name="BatModel" parent="." instance=ExtResource("1_ncase")]
+transform = Transform3D(1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, -0.7, 0)
diff --git a/refueling_pad.gd.uid b/refueling_pad.gd.uid
new file mode 100644
index 0000000..aad9359
--- /dev/null
+++ b/refueling_pad.gd.uid
@@ -0,0 +1 @@
+uid://dcsta8rmoe340
diff --git a/scenes/refueling_pad.tscn b/scenes/refueling_pad.tscn
index 3e38d2c..c337a8e 100644
--- a/scenes/refueling_pad.tscn
+++ b/scenes/refueling_pad.tscn
@@ -1,6 +1,10 @@
-[gd_scene load_steps=5 format=3 uid="uid://cwivci11c4qe8"]
+[gd_scene load_steps=5 format=3 uid="uid://drmmkm10dn20y"]
 
+<<<<<<< HEAD:refueling_pad.tscn
+[ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"]
+=======
 [ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]
+>>>>>>> origin/main:scenes/refueling_pad.tscn
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_s8ska"]
 albedo_color = Color(0, 0.435682, 0.0116695, 1)
diff --git a/scenes/ui/fuel_slider.tscn b/scenes/ui/fuel_slider.tscn
index ffee6d9..cd1c04f 100644
--- a/scenes/ui/fuel_slider.tscn
+++ b/scenes/ui/fuel_slider.tscn
@@ -1,6 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://bds3pc6arkgvv"]
+[gd_scene load_steps=6 format=3 uid="uid://bt0f8rckpnlhi"]
 
 [ext_resource type="Texture2D" uid="uid://b5wcn006sn2kw" path="res://assets/sprites/Fuel gauge - rocket game.png" id="1_ts72v"]
+<<<<<<< HEAD:scenes/fuel_slider.tscn
+[ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"]
+=======
+>>>>>>> origin/main:scenes/ui/fuel_slider.tscn
 
 [sub_resource type="Gradient" id="Gradient_64sbd"]
 offsets = PackedFloat32Array(0, 0.535211, 1)