some changes
fixed merge