merge both git ignores