Index: src/Common/SemanticError.h
===================================================================
--- src/Common/SemanticError.h	(revision 6040e67da4f1afa6550d4e3339f24a66a4be8fc3)
+++ src/Common/SemanticError.h	(revision 6d2aa7ed34ca640586a9a226f1a44c6fb2bbdea5)
@@ -65,10 +65,5 @@
 );
 
-<<<<<<< Updated upstream
-// ## used here to allow empty __VA_ARGS__
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
-=======
 #define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
->>>>>>> Stashed changes
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));