some random change
fixed merge conflict
weird lacking test
retyped rank test