fix merge conflicts
Revert "delete twitter yml"

This reverts commit 90eac0634db336c1468e369c1afcfc55fc7b4757.