remove config and procfile
resolve conflict