Delete old fringe files at start
Escape * in README
Update .gitignore
remove merge savetodisk confilct
moved duplicate detection with prev-/current-fringes into merge phase