* solve the conflict of ops with the same name. test=develop
This reverts commit abe3e690. test=develop
