diff --git a/mps/src/o1alcc.gmk b/mps/src/o1alcc.gmk
index 98e4f66669f..d44588e12d6 100644
--- a/mps/src/o1alcc.gmk
+++ b/mps/src/o1alcc.gmk
@@ -1,7 +1,7 @@
 #
 #     BUILD FOR OSF/1, ALPHA, DIGITAL C PLATFORM
 #
-# $HopeName: MMsrc!o1alcc.gmk(trunk.3) $
+# $HopeName: MMsrc!o1alcc.gmk(trunk.4) $
 #
 # Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 #
@@ -17,7 +17,8 @@ PFMDEFS = -D_ANSI_C_SOURCE
 MPM = assert.c ring.c mpsliban.c mpm.c bt.c \
       arenavm.c space.c pool.c poolmfs.c \
       poolmv.c root.c format.c buffer.c lockan.c ref.c \
-      trace.c than.c protan.c shield.c mpsi.c ld.c vmo1.c event.c
+      trace.c than.c protan.c shield.c mpsi.c ld.c vmo1.c \
+      mpsioan.c event.c
 MPMS = sso1al.s
 AMC = amc.c
 LO = lo.c
diff --git a/mps/src/o1algc.gmk b/mps/src/o1algc.gmk
index cb9958301cf..f9fc42fdef4 100644
--- a/mps/src/o1algc.gmk
+++ b/mps/src/o1algc.gmk
@@ -1,11 +1,7 @@
 #
 #     BUILD FOR OSF/1, ALPHA, GCC PLATFORM
 #
-<<<<<<< /u/ldisk2/gavinm/mmtmp/src/o1algc.gmk
-# $HopeName: MMsrc!o1algc.gmk(trunk.8) $
-=======
-# $HopeName: MMsrc!o1algc.gmk(MMdevel_event.2) $
->>>>>>> 1.4.1.2
+# $HopeName: MMsrc!o1algc.gmk(trunk.9) $
 #
 # Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 #
@@ -18,22 +14,16 @@
 PFM = o1algc
 PFMDEFS = -D_ANSI_C_SOURCE
 
-<<<<<<< /u/ldisk2/gavinm/mmtmp/src/o1algc.gmk
 MPM = assert.c ring.c mpsliban.c mpm.c bt.c \
       arenavm.c space.c pool.c poolmfs.c \
       poolmv.c root.c format.c buffer.c lockan.c ref.c \
-      trace.c than.c protan.c shield.c mpsi.c ld.c vmo1.c event.c
+      trace.c than.c protan.c shield.c mpsi.c ld.c vmo1.c \
+      mpsioan.c event.c
 MPMS = sso1al.s
 AMC = amc.c
 LO = lo.c
 MRG = poolmrg.c
 DW = dw.c fmtdy.c
-=======
-STD = assert.c deque.c error.c mpsliban.c meter.c misc.c
-MPM = arenan.c space.c pool.c poolclas.c poolmfs.c \
-      poolmv.c pools.c root.c fix.c format.c buffer.c lockan.c event.c
-AMC = poolamc.c
->>>>>>> 1.4.1.2
 TESTLIB = testlib.c
 
 LIBS = -lm
diff --git a/mps/src/sos8gc.gmk b/mps/src/sos8gc.gmk
index f833014a2f5..3fe30ec6651 100644
--- a/mps/src/sos8gc.gmk
+++ b/mps/src/sos8gc.gmk
@@ -1,7 +1,7 @@
 #
 #     BUILD FOR SOLARIS/SPARC/GCC PLATFORM
 #
-#  $HopeName: MMsrc!sospgc.gmk(trunk.7) $
+#  $HopeName: MMsrc!sospgc.gmk(trunk.8) $
 #  Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 #
 #  This is the GNU makefile for platform.sospgc.
@@ -13,7 +13,8 @@ PFMDEFS = -D_POSIX_SOURCE -D__EXTENSIONS__
 MPM = assert.c ring.c mpsliban.c mpm.c bt.c \
       arenavm.c vmso.c space.c pool.c poolmfs.c \
       poolmv.c root.c format.c buffer.c lockan.c ref.c \
-      trace.c than.c protso.c shield.c mpsi.c ld.c event.c
+      trace.c than.c protso.c shield.c mpsi.c ld.c \
+      mpsioan.c event.c
 MPMPS = sssosp.S
 AMC = amc.c
 LO = lo.c
diff --git a/mps/src/sos9sc.gmk b/mps/src/sos9sc.gmk
index 1743c999f24..5fbd6b552f8 100644
--- a/mps/src/sos9sc.gmk
+++ b/mps/src/sos9sc.gmk
@@ -1,7 +1,7 @@
 #
 #     BUILD FOR Solaris/UltraSPARC/SunPro C PLATFORM
 #
-#  $HopeName: MMsrc!soussc.gmk(trunk.4) $
+#  $HopeName: MMsrc!soussc.gmk(trunk.5) $
 #
 #  This is the GNU makefile for platform.soussc
 #
@@ -12,7 +12,8 @@ PFMDEFS = -D_POSIX_SOURCE -D__EXTENSIONS__
 MPM = assert.c ring.c mpsliban.c mpm.c bt.c \
       arenavm.c vmso.c space.c pool.c poolmfs.c \
       poolmv.c root.c format.c buffer.c lockan.c ref.c \
-      trace.c than.c protso.c shield.c mpsi.c ld.c event.c
+      trace.c than.c protso.c shield.c mpsi.c ld.c \
+      mpsioan.c event.c
 MPMPS = ssussp.s
 AMC = amc.c
 MRG = poolmrg.c
diff --git a/mps/src/sus8lc.gmk b/mps/src/sus8lc.gmk
index 401f9aa2701..48539674f82 100644
--- a/mps/src/sus8lc.gmk
+++ b/mps/src/sus8lc.gmk
@@ -1,7 +1,7 @@
 #
 #     BUILD FOR SUNOS/SPARC/LCC PLATFORM
 #
-#  $HopeName: MMsrc!susplc.gmk(trunk.3) $
+#  $HopeName: MMsrc!susplc.gmk(trunk.4) $
 #  Copyright (C) 1996,1997 Harlequin Group, all rights reserved
 #
 #  This is the GNU makefile for platform.susplc.
@@ -12,16 +12,16 @@ PFM = susplc
 MPM = assert.c ring.c mpsliban.c mpm.c bt.c \
       arenavm.c vmsu.c space.c pool.c poolmfs.c \
       poolmv.c root.c format.c buffer.c lockan.c ref.c \
-      trace.c than.c protsu.c shield.c mpsi.c ld.c event.c
+      trace.c than.c protsu.c shield.c mpsi.c ld.c \
+      mpsioan.c event.c
 MPMS = sssusp.s
 AMC = amc.c
 LO = lo.c
 MRG = poolmrg.c
 DW = fmtdy.c dw.c
-SW = assert.c ring.c mpsliban.c mpm.c \
-     arenavm.c vmrm.c space.c pool.c poolmfs.c \
+SW = assert.c ring.c mpm.c arenacl.c space.c pool.c poolmfs.c \
      poolmv.c root.c format.c buffer.c lockan.c ref.c \
-     trace.c than.c protsu.c shield.c mpsi.c ld.c ssan.c
+     trace.c than.c protsw.c shield.c mpsisw.c ld.c ssan.c poolepdl.c
 
 TESTLIB = testlib.c