some changes
remove merge conflicts