Minor model tweak
committing submodule changes
Fixed merge conflict.