merge complete

final merge to complete the dual fix