working api
add gunicorn
Fix conflicts