Fixed Conflicts

Rails is now working as expected