* fix merge