Allow svn to merge