moses: fix merge conflict
Merge pull request #976 from linas/moses-select4

moses: fix merge conflict