Fixed merging stuff in models.py