--- a/ExtGG.thy	Thu Jan 28 16:33:49 2016 +0800
+++ b/ExtGG.thy	Thu Jan 28 16:36:46 2016 +0800
@@ -1,4 +1,3 @@
-<<<<<<< local
 section {*
   This file contains lemmas used to guide the recalculation of current precedence 
   after every system call (or system operation)
@@ -1628,6 +1627,3 @@
 end
 end
 
-
-
->>>>>>> other

--- a/PrioG.thy	Thu Jan 28 16:33:49 2016 +0800
+++ b/PrioG.thy	Thu Jan 28 16:36:46 2016 +0800
@@ -1,6 +1,5 @@
-<<<<<<< local
-theory Correctness
-imports PIPBasics
+theory PrioG
+imports CpsG
 begin
 
 
@@ -1610,4 +1609,3 @@
 
 end
 end
->>>>>>> other