fixed #166 autogenerated tooltips by fixing merge