Fix rebase merge fail of .gitignore