solved db and pitchfork conflicts