updated to rails 3.1.11
fixed merge conflicts