fix merge naming