fixed merge issue in gitignore