update fanfuel tv style
fix merge conflict