fix Merge and name
 merge
fix