Checkout what happened when I've made too much commits on the same files and how YOU TOO can merge a conflicted pull-requests!

more ...