some changes
fixed merge conflicts