updating the git ignores
resolving merge conflict