switch conf.py to leadership
resolve conflict