fixes
gitignore
conflict resolve