reorder dependencies to avoid merge conflicts later