add bio for myself (Mason)
fix merge conflict