a new change on merge1