edit results
merging changes