rebuild post merge