setup bad merge file
BAD MERGE - but I don't care >.>
working ch1
working ch2
Revert "BAD MERGE - but I don't care >.>"

This reverts commit 36cc950be0e42c61b813cfdf584fe9da68daee2c, reversing
changes made to 0ade9851a03096d33d9c6d67151c3593c893efab.
Merge branch 'master' into ft1
Revert "Revert "BAD MERGE - but I don't care >.>""

This reverts commit 227e456af67e7f0160738c5d36e44633abdde640.