Fix merge issue: remove duplicate skips