created forum models and db schema
migration to add district column to user
Conflict resolution