remove circular conflicts where possible, clarify where not
thanks @SanskritFritz for the useful comment!