---
# System prepended metadata

title: Fixing Conflicts

---

# Fixing Conflicts

- Reverted MIP101 to commit https://github.com/makerdao/mips/commit/354091109b34396c8cdabc4689ceded1293a7842 
    - [![](https://hackmd.io/_uploads/BkM57ppZa.png)](https://github.com/makerdao/mips/commits/master/MIP101)
- Reverted MIP104 to commit https://github.com/makerdao/mips/commit/6b1c1542292ce239083dd0bbf537b780089b6a37
    - [![](https://hackmd.io/_uploads/SJCn7Tpb6.png)](https://github.com/makerdao/mips/commits/master/MIP104)
    - TBD: https://github.com/makerdao/mips/commit/0a307d142bb59f7f995ac2c4488acf5882689160 and https://github.com/makerdao/mips/commit/6eda80ec3cf69a4c65723671bd896aec7b364db4 need to be merged in too!
        - [![](https://hackmd.io/_uploads/SJINNp6WT.png)](https://github.com/makerdao/mips/commits/master/MIP104)
        - [![](https://hackmd.io/_uploads/BJFrEa6-T.png)](https://github.com/makerdao/mips/commits/master/MIP104)
- Reverted MIP106 to commit https://github.com/makerdao/mips/commit/6b1c1542292ce239083dd0bbf537b780089b6a37
    - [![](https://hackmd.io/_uploads/rkuKNTpWT.png)](https://github.com/makerdao/mips/commits/master/MIP106)
- Reverted MIP113 to commit https://github.com/makerdao/mips/commit/fdabf79f5a3dd0d1c5f29afddcab3c8021099ece
    - [![](https://hackmd.io/_uploads/H1zBraT-T.png)](https://github.com/makerdao/mips/commits/master/MIP113)
    - TBD: Merge in later updates!
- TBD: Now, add Rune's SP16 changed bits into these. Find what these are by diffchecking them against the commits previous to the merging of SP12
- We're home free!