[FIX] Merging errors fixed