books added
confilict fixed