chore: fixed dependencies merge conflict