merging comments change and gitignore