Fix graphite settings.py
Fix wrong file
fix merge