Make sure there are no XXX's before we merge?