removed country from user model
fix schema version merge conflict