delete svn log
add dev
add master
conflict fixed