chore(oxlint): resolve merge conflicts with master view more