gitignore cleanup

it had some leftover conflict junk