modifying models __init__.py
fixed merge