fix merge bugs
merge