fixed merge conflicts
sovled merge conflict