modify svn resolve conflict script to st list