Merge with FPP