fps control
fixed merge issue