Remove conflict lines from gitignore

Not that its very impactful, but I noticed the gitignore had conflict markers.  I also added build/ and logs/ since I thought they'd be useful.