Fixed merge and reply