Merge with gitignore