publish - fix merge