fixed conflicts

Author: trung

src/main/java/org/mdkt/compiler/CompilationException.java

@@ -0,0 +1,9 @@
+package org.mdkt.compiler;
+
+public class CompilationException extends RuntimeException {
+	private static final long serialVersionUID = 5272588827551900536L;
+
+	public CompilationException(String msg) {
+		super(msg);
+	}
+}