small fix in merging description