fix post merge