Test fixed merge error