fixed syntax error that occurred in merge conflict resolution
fixed syntax error that occurred in merge conflict resolution

ophrescue/RescueRails,ophrescue/RescueRails,ophrescue/RescueRails,ophrescue/RescueRails