Update gitignore
lingering <<< merge line.