adding merge generated files to gitignore