change twitter image
fix merge conflict