stats fpp sytling
fix merge conflict