modify f4 with haha
solve conflict as original dir