fix merge'