1 files changed, 12 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 56c8bd1..1f8ef4d 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -254,9 +254,15 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Standard
 | Draft
 |-
+<<<<<<< HEAD
 | [[bip-0069.mediawiki|69]]
 | Lexicographical Indexing of Transaction Inputs and Outputs
 | Kristov Atlas
+=======
+| [[bip-0068.mediawiki|68]]
+| Consensus-enforced transaction replacement signalled via sequence numbers
+| Mark Friedenbach
+>>>>>>> bitcoin/master
 | Standard
 | Draft
 |-
@@ -283,6 +289,12 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Stephen Pair
 | Standard
 | Draft
+|-
+| [[bip-0101.mediawiki|101]]
+| Increase maximum block size
+| Gavin Andresen
+| Standard
+| Draft
 |}
 
 <!-- IMPORTANT!  See the instructions at the top of this page, do NOT JUST add BIPs here! -->