merge jm-danny