add bye
fix merge