Add ransack
Fix merge conflict