resolve conflict
Merge branch 'hstore_arrays_fix' of github.com:inopinatus/rails into hstore_arrays_fix