updated gitignore
fixed merging error