Minor corrections for merge