add status
fix merge