update
some conflicts in gitignore was fixed