merge slave
remerge