* fix merge error