- fixed library tagline
- fixed merge