update liveness
add stuff
fix merge