edit by dev5
fix merge conflic