changing models
fixed merge error