working wait merge