readme fix
lib import update
fix merge conflicts