Fix output sent on success
Fix merge