upgrading to rails 4.1.0
fixed merge conflict