(refs #443)Fix merge guidance