User blog comment:Olimario849/10 thumbs down/@comment-5590986-20140920185600

Conflicts happen everywhere, get used to it. Also you're lucky to be in this era, cuz back then, Conflicts were about 10x more constant.