updating some information
merging