fix merge conflict bug