*** kernel/content/attribute_edit.php.original  2009-09-30 19:52:54.000000000 +0930
--- kernel/content/attribute_edit.php   2011-05-09 16:00:52.000000000 +0930
***************
*** 410,415 ****
--- 410,421 ----
              return;
      }
  }
+ elseif($http->hasPostVariable( 'PublishAfterConflict' ) ){ // Added to Publish a conflict version 
+   if( $http->postVariable( 'PublishAfterConflict' ) == 1 ){
+       if ( $Module->runHooks( 'action_check', array( $class, $object, $version, $contentObjectAttributes, $EditVersion, $EditLanguage, $FromLanguage, &$Result  ) ) )
+             return;
+   }
+ }

  if ( isset( $Params['TemplateObject'] ) )
      $tpl = $Params['TemplateObject'];