small fixes for merge