fixing merge conflicts
fixed merge conflicts