fix enable priority problem
fix merge