update procfile
update requirements
resolve conflicts
resolve conflicts
git rm old files