Fixed styling
Fixed env file and credentials
fixed env and creditentials
Delete .env in vendor directory
Resolve merge conflict
Switching branches
Resolved Merge Conflict
Resolved Merge Conflicts
Switched the seed from string to JSON
Fixed merge conflicts