changed procfile
fixed merge conflicts