solved conflicts in models