commit
resolve merge conflicts
remove .env?
updage gitignore