User blog comment:ForestFairy/How to resolve conflict/@comment-26051251-20150824201259/@comment-4129195-20150824202054

This is supposed to be advice for other users. This means other blogs may (or may not) be for this place, but are for other communities.