prepare to test  merge ff