Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -r1.2.22.2 -r1.2.22.3
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 May 2016 19:55:32 -0000	1.2.22.3
@@ -7,7 +7,7 @@
     package_key
     message_key
     locale
-    {return_url:return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+    {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
 lang::message::edit $package_key $message_key $locale [list conflict_p f]