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.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -13,6 +13,7 @@
 lang::message::edit $package_key $message_key $locale [list conflict_p f]
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl