diff --git a/ableos/src/wasm/wasm_sys.rs b/ableos/src/wasm/wasm_sys.rs
index 900afcea..b243af27 100644
--- a/ableos/src/wasm/wasm_sys.rs
+++ b/ableos/src/wasm/wasm_sys.rs
@@ -29,6 +29,7 @@ macro_rules! syscall_enum {
    };
 }
 syscall_enum! {
+<<<<<<< HEAD
 	KILL=0,              // Provide a PID
 	CONSOLE_RESET=1,     // Reset the console
 	CONSOLE_IN=2,        // Console Input
@@ -43,6 +44,20 @@ syscall_enum! {
 	//
 	GET_HOSTNAME=10,
 	SET_HOSTNAME=11,
+=======
+   KILL=0,              // Provide a PID
+   CONSOLE_RESET=1,     // Reset the console
+   CONSOLE_IN=2,        // Console Input
+   CONSOLE_OUT=3,       // Console output
+   CONSOLE_GET_TITLE=4, // Get the console title
+   CONSOLE_SET_TITLE=5, // Set the console title
+   CONSOLE_GET_BAR=6,
+   CONSOLE_SET_BAR=7,
+
+   //
+   GET_HOSTNAME=10,
+   SET_HOSTNAME=11,
+>>>>>>> fb851e78c5767d5c0d7f80175d5061fd0746813e
 
 
 	NEW_THREAD=12,
@@ -85,7 +100,11 @@ syscall_enum! {
 	SOCKET_RECEIVE=43,
 
 
-
+   GET_PID=44,           // Get the proccess ID
+   PROCESS_INFO=45,      // Get information about the process
+   //scheduler Related Syscals
+   GET_PRIORITY=46, // Get scheduler priority
+   SET_PRIORITY=47, // Set scheduler priority
 
 	EXIT=50,
 	EMPTY=0xFFFF,