Fixed merge artifacts in gitignore