[FIX] fixed bad merge