merging after gitignore