updated contributor information
merging