merge jms master