User blog comment:Longshot17/What's the conflict here/@comment-7395018-20131202024733

Wait wait... you think THESE are conflicts?

The major conflicts have already passed.