Fix merge conflict [skip ci]
Fix merge conflict [skip ci]

activerecord-hackery/ransack,guilleva/ransack,roman-franko/ransack,laserlemon/ransack,outstand/ransack,johan--/ransack,avit/ransack,Mario245/ransack,mariorcardoso/ransack,reinteractive/ransack,martndemus/ransack,AndrewSwerlick/ransack,vaski/ransack,Eric-Guo/ransack,nagyt234/ransack