some changes
fixing merge conflicts