Trying SVN -> Git again
merge conflicts