[minor] [fixed conflicts]