fixed some library parts
fixing merge issue