updating model code
fixing conflicts