post merge change