first cut at svn merge and conflict