User blog comment:ForestFairy/How to resolve conflict/@comment-5111452-20150827065923/@comment-4632631-20150907104044

*laughs*

Wait, what if you're not an admin?