updating ignore
adding assets
resolving git merge conflict