diff --git a/framework/api_vulkan_sample.cpp b/framework/api_vulkan_sample.cpp
index c023d7244..7e0883c34 100644
--- a/framework/api_vulkan_sample.cpp
+++ b/framework/api_vulkan_sample.cpp
@@ -100,13 +100,13 @@ void ApiVulkanSample::update(float delta_time)
 	}
 }
 
-void ApiVulkanSample::update_overlay(float delta_time, const std::function<void()>& additionalUI)
+void ApiVulkanSample::update_overlay(float delta_time, const std::function<void()>& additional_ui)
 {
 	if (gui)
 	{
-		gui->show_simple_window(get_name(), vkb::to_u32(1.0f / delta_time), [this, additionalUI]() {
+		gui->show_simple_window(get_name(), vkb::to_u32(1.0f / delta_time), [this, additional_ui]() {
 			on_update_ui_overlay(gui->get_drawer());
-			additionalUI();
+			additional_ui();
 		});
 
 		gui->update(delta_time);
@@ -862,7 +862,7 @@ void ApiVulkanSample::on_update_ui_overlay(vkb::Drawer &drawer)
 
 void ApiVulkanSample::store_shader(const vkb::ShaderSourceLanguage& shaderLanguage, const std::vector<std::pair<vkb::ShaderType, std::string>>& listOfShader)
 {
-	platform->get_available_shaders().insert({shaderLanguage, listOfShader});
+	// platform->get_available_shaders().insert({shaderLanguage, listOfShader});
 }
 
 void ApiVulkanSample::create_swapchain_buffers()
diff --git a/framework/api_vulkan_sample.h b/framework/api_vulkan_sample.h
index 35eeb52bc..73d5320cd 100644
--- a/framework/api_vulkan_sample.h
+++ b/framework/api_vulkan_sample.h
@@ -112,7 +112,7 @@ class ApiVulkanSample : public vkb::VulkanSample
 
 	virtual void update(float delta_time) override;
 
-	virtual void update_overlay(float delta_time, const std::function<void()>& additionalUI) override;
+	virtual void update_overlay(float delta_time, const std::function<void()>& additional_ui) override;
 
 	virtual bool resize(const uint32_t width, const uint32_t height) override;
 
@@ -365,18 +365,17 @@ class ApiVulkanSample : public vkb::VulkanSample
 	virtual void on_update_ui_overlay(vkb::Drawer &drawer);
 
 	/**
-<<<<<<< HEAD
 	 * @brief Initializes the UI. Can be overridden to customize the way it is displayed.
 	 */
 	virtual void prepare_gui();
-=======
+
+	/**
 	 * @brief Stores a list of shaders for the active sample, used by plugins to dynamically change the shader
 	 * 
 	 * @param shaderLanguage The shader language for which the shader list will be provided
 	 * @param listOfShader The shader list, where paths and shader types are provided
 	 */
 	void store_shader(const vkb::ShaderSourceLanguage& shaderLanguage, const std::vector<std::pair<vkb::ShaderType, std::string>>& listOfShader);
->>>>>>> 4768884 (Add new plugin real time shader selection)
 
   private:
 	/** brief Indicates that the view (position, rotation) has changed and buffers containing camera matrices need to be updated */
diff --git a/framework/hpp_api_vulkan_sample.cpp b/framework/hpp_api_vulkan_sample.cpp
index 7d5b94602..993e78aec 100644
--- a/framework/hpp_api_vulkan_sample.cpp
+++ b/framework/hpp_api_vulkan_sample.cpp
@@ -417,11 +417,11 @@ vk::PipelineShaderStageCreateInfo HPPApiVulkanSample::load_shader(const std::str
 	return vk::PipelineShaderStageCreateInfo({}, stage, shader_modules.back(), "main");
 }
 
-void HPPApiVulkanSample::update_overlay(float delta_time, const std::function<void()>& additionalUI)
+void HPPApiVulkanSample::update_overlay(float delta_time, const std::function<void()>& additional_ui)
 {
 	if (gui)
 	{
-		gui->show_simple_window(get_name(), vkb::to_u32(1.0f / delta_time), [this, additionalUI]() { on_update_ui_overlay(gui->get_drawer()); additionalUI(); });
+		gui->show_simple_window(get_name(), vkb::to_u32(1.0f / delta_time), [this, additional_ui]() { on_update_ui_overlay(gui->get_drawer()); additional_ui(); });
 
 		gui->update(delta_time);
 
diff --git a/framework/hpp_api_vulkan_sample.h b/framework/hpp_api_vulkan_sample.h
index 33ff48881..19432a5d8 100644
--- a/framework/hpp_api_vulkan_sample.h
+++ b/framework/hpp_api_vulkan_sample.h
@@ -286,8 +286,9 @@ class HPPApiVulkanSample : public vkb::HPPVulkanSample
 	/**
 	 * @brief Updates the overlay
 	 * @param delta_time The time taken since the last frame
+	 * @param additional_ui Function that implements an additional Gui
 	 */
-	void update_overlay(float delta_time, const std::function<void()>& additionalUI);
+	void update_overlay(float delta_time, const std::function<void()>& additional_ui);
 
 	/**
 	 * @brief If the gui is enabled, then record the drawing commands to a command buffer
diff --git a/framework/platform/application.cpp b/framework/platform/application.cpp
index 9e68707db..e579a71c2 100644
--- a/framework/platform/application.cpp
+++ b/framework/platform/application.cpp
@@ -61,7 +61,7 @@ void Application::update(float delta_time)
 }
 
 
-void Application::update_overlay(float delta_time, const std::function<void()>& additionalUI)
+void Application::update_overlay(float delta_time, const std::function<void()>& additional_ui)
 {
 
 }
diff --git a/framework/platform/application.h b/framework/platform/application.h
index 3e1bbcc51..7041866de 100644
--- a/framework/platform/application.h
+++ b/framework/platform/application.h
@@ -55,8 +55,10 @@ class Application
 
 	/**
 	 * @brief Main loop sample overlay events
+	 * @param delta_time The time taken since the last frame
+	 * @param additional_ui Function that implements an additional Gui
 	 */
-	virtual void update_overlay(float delta_time, const std::function<void()>& additionalUI =  [](){});
+	virtual void update_overlay(float delta_time, const std::function<void()>& additional_ui =  [](){});
 
 	/**
 	 * @brief Indicates that the plugin wants to change the shader in the sample
@@ -89,7 +91,6 @@ class Application
 
 	DebugInfo &get_debug_info();
 
-<<<<<<< HEAD
 	inline bool should_close() const
 	{
 		return requested_close;
@@ -101,9 +102,8 @@ class Application
 	{
 		requested_close = true;
 	}
-=======
+
 	std::weak_ptr<Gui> get_gui();
->>>>>>> 4768884 (Add new plugin real time shader selection)
 
   protected:
 	float fps{0.0f};
diff --git a/framework/vulkan_sample.cpp b/framework/vulkan_sample.cpp
index 3caaefaec..1393356c6 100644
--- a/framework/vulkan_sample.cpp
+++ b/framework/vulkan_sample.cpp
@@ -333,7 +333,7 @@ void VulkanSample::update(float delta_time)
 	render_context->submit(command_buffer);
 }
 
-void VulkanSample::update_overlay(float delta_time, const std::function<void()>& additionalUI) 
+void VulkanSample::update_overlay(float delta_time, const std::function<void()>& additional_ui) 
 {
 }
 
diff --git a/framework/vulkan_sample.h b/framework/vulkan_sample.h
index fe4017575..87dfdef61 100644
--- a/framework/vulkan_sample.h
+++ b/framework/vulkan_sample.h
@@ -129,8 +129,10 @@ class VulkanSample : public Application
 
 	/**
 	 * @brief Main loop sample overlay events
+	 * @param delta_time The time taken since the last frame
+	 * @param additional_ui Function that implements an additional Gui
 	 */
-	virtual void update_overlay(float delta_time, const std::function<void()>& additionalUI =  [](){}) override;
+	virtual void update_overlay(float delta_time, const std::function<void()>& additional_ui =  [](){}) override;
 
 	/**
 	 * @brief Indicates that the plugin wants to change the shader in the sample