fix fps from manual merge