updated description of merge