compatible with rails 4
merge