Removed conflicts with model