Database file changed, must have been from rails server, commit needed to
check out master and merge