User blog comment:ForestFairy/How to resolve conflict/@comment-25779132-20150822182418/@comment-25417872-20150822182500

Ask her politely.