minor edit
merging