Activerecord validations

You should rebase on @alisatee 's improved branch so that you're not committing this file.  It's probably the source of your git merge conflict.