trying to git pull
fixed merge conflict
Merge branch 'master' of https://github.com/calblueprint/rtr4c
press update model