merging bug fix on return value