#309 fixing smoke tests about merge patient