merge conflict fixed

merge conflict fixed