adding .origin to gitignore, fixing a merge error