models updates for git conflict
conflict with merges fix