Removed merge conflict info from 26997
Merge pull request #176 from roydude/v1-train

Removed merge conflict info from 26997