merge new fix