For Sam's last merge