diff --git a/autotest/Time/Time.cpp b/autotest/Time/Time.cpp
index 08c2daead..ce3064892 100644
--- a/autotest/Time/Time.cpp
+++ b/autotest/Time/Time.cpp
@@ -11,11 +11,7 @@ CONSOLE_APP_MAIN
 	DUMP(GetTimeZone());	
 	Date d = GetSysDate();
 	if(d < Date(d.year, 3, 20) && d > Date(d.year - 1, 10, 30)) {
-<<<<<<< .mine
 		LOG("Normalni CZ time");
-=======
-		LOG("Normal CZ time");
->>>>>>> .r7914
 		ASSERT(GetTimeZone() == 60);
 		ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1200") == Time(2014, 3, 25, 23, 1, 15));
 		ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1000") == Time(2014, 3, 25, 21, 1, 15));
diff --git a/tutorial/Gui12/main.cpp b/tutorial/Gui12/main.cpp
index c8d97ade4..cf20873fa 100644
--- a/tutorial/Gui12/main.cpp
+++ b/tutorial/Gui12/main.cpp
@@ -46,9 +46,9 @@ struct MyAppWindow : TopWindow {
 		AddFrame(status);
 		AddFrame(InsetFrame());
 		menu.Set(THISBACK(MainMenu));
-		menu.WhenHelp = status;
-		tool.Set(THISBACK(SubBar));
-		tool.WhenHelp = status;
+		menu.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
+		tool.Set(THISBACK(SubBar)); 
+		tool.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
 	}
 };