bundle update
fix Procfile
merge