Fixed merge issue with class-path entry in rest