fixed missed merge markup in .gitignore