merge - for svn convert
merge for terminal