XWIKI-10620 : Unable to resolve wikiReference on document conflict
Applying fix to the new location of the macro (changed from extension.vm to logging_macros.vm via XWIKI-10670 in a2ab9750fbfb621d539cf89891f51d26bd8ec0dd)
Merge pull request #300 from vrachieru/patch-1

XWIKI-10620 : Unable to resolve wikiReference on document conflict