- fixed merge error with renaming