debug
merge
gitignore working