fixed FDM merge issues