Fixed merge conflict in README

I just saw that you had a merge conflict in your README which prevent it from being rendered correctly in github. I think I've made the right assumption in fixing the merge conflict but feel free to correct it if I am wrong. I just thought it might help :smile: