Index: sources/gui/GuiController.cpp
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66)
@@ -1,16 +1,26 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \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"