also works at Rails4.1.0
4.1.0 ok
remove conflict
fix conflict again..
count up version No