merge
clean models
fix merge conflict