[FIX] remove leftovers from merge conflict