Add procfile
Remove debugging code
Resolve conflict