[chore] resolving conflicts