Fix gitignore
Fix
merge conflicts