working out gitignore issues
merge conflicts resolved