Fix gitignore merge
Change comment
Change comment