diff --git a/Makefile.rules.windows b/Makefile.rules.windows
index 6ab89c7..5663b20 100644
--- a/Makefile.rules.windows
+++ b/Makefile.rules.windows
@@ -4,12 +4,8 @@ include Makefile.config
 USE_VFW = 1
 TARGET = $(APP).exe
 CPP = g++
-<<<<<<< HEAD
-CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L -lucrtbase
-=======
 CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L
 #CPPFLAGS = -Wall -O3 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L
->>>>>>> 03b9395dd2b60a5aa3d3ab81fdc39a20289fcfb1
 INCLUDES = 
 LDFLAGS = -lws2_32 -ljpeg
 LIBS = `pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -mwindows
diff --git a/convert.cc b/convert.cc
index 36a0d25..146742a 100644
--- a/convert.cc
+++ b/convert.cc
@@ -69,7 +69,7 @@ int convert_debug_open(uint32_t pixelformat, int srcw, int srch) {
 	//
 	// check to create file, if not possible try creating the directory and create the file again
 	tmptr = localtime(&t);
-	strftime(fname, LEN_FILENAME, "%F-%R", tmptr);
+	strftime(fname, LEN_FILENAME, "%Y%m%d-%H%M%S", tmptr);
 	snprintf (fullfname, LEN_FULLFILENAME, "%s/%s.videodump", config.debugpath, fname);
 
 	if ((convert_debug_fd = creat (fullfname, 0666)) == -1) {
diff --git a/debug.cc b/debug.cc
index 3aca478..5f03dc6 100644
--- a/debug.cc
+++ b/debug.cc
@@ -37,7 +37,7 @@ void debug_tofile(char *fname, int isheader, char *fmt, ...) {
 	// append time to filename to the start of the filename
 	struct tm *timetm = localtime(&debug_time);
 	char timestr[64] = "";
-	strftime(timestr, 63, "%F-%H%M%S", timetm);
+	strftime(timestr, 63, "%Y%m%d-%H%M%S", timetm);
 	fn = "debug-" + (std::string)timestr + "-" + (std::string)fname;
 
 	gettimeofday(&tv,NULL);