cleaned up gitignore
fixed merge conflict on gitignore