Index: sources/gui/GuiController.cpp
===================================================================
diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r666594860f4ea32da9a2bd362d40325b881b11f9
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 666594860f4ea32da9a2bd362d40325b881b11f9)
@@ -4,23 +4,13 @@
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
-<<<<<<< HEAD:sources/gui/guicontroller.cpp
- * 
- * \file guicontroller.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 25-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 24-Sep-2019
- * 
-=======
  *
  * \file GuiController.cpp
  * \author (last) Peter Lucia
  * \date (last) 15-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 26-Aug-2020
  *
->>>>>>> master:sources/gui/GuiController.cpp
  */
 #include "GuiController.h"
 
@@ -330,3 +320,23 @@
     data.mFlags = QBitArray(16, false); // 16 QBitArray of flags, if needed
     emit didActionReceive(data);
 }
+
+/*!
+ * \brief GuiController::doAlertRequest
+ * Handles a request to show a new alert
+ * \param alert - (GuiAlert) The alert information to show
+ */
+void GuiController::doAlertRequest(const GuiAlertRequestData &alertRequest)
+{
+    emit didAlertRequest(alertRequest);
+}
+
+/*!
+ * \brief GuiController::doAlertResponse
+ * Handles a user response to an alert
+ * \param alertResponse - (GuiAlertResponse) the alert response
+ */
+void GuiController::doAlertResponse(const GuiAlertResponseData &alertResponse)
+{
+    emit didAlertResponse(alertResponse);
+}