merge pingpong and my modules