fix merge conflict for gitignore
fix merge conflict for gitignore

baldwmic/HNR499,baldwmic/HNR499,baldwmic/HNR499,baldwmic/portfolio-website,baldwmic/portfolio-website,baldwmic/HNR499,baldwmic/portfolio-website,baldwmic/portfolio-website,baldwmic/portfolio-website,baldwmic/HNR499