some correction
merge