ff click fix
conflict fix