fixed conflicts after merge

Fixed conflicts after merge