moses: fix merge conflict