Fix Conflict and fix compilation

Author: Critsium-xy

source/source_pw/module_ofdft/kedf_xwm.cpp

@@ -1,6 +1,6 @@
 #include "./kedf_xwm.h"
 
-#include "module_parameter/parameter.h"
+#include "source_io/module_parameter/parameter.h"
 #include "source_base/parallel_reduce.h"
 #include "source_base/tool_quit.h"