Testing Rails
Conflicts resolved in model