making changes
fixed merge conflicts