fixes
gitignore
lab2
conflict resolve