fix for merge error.