make some changes
merge conflicts