dist update
post merge updates