merge with abdala after patient status fix