Merge "removing shadowing redeclaration of result"