add patch file to rename duplicated variable shadow