Fix gitignore merge testfolders entry