[FIX] Merge error fixed