Fix for merge error