Fix conficts in model