I don't know if I understand your design right: You have a continuous outcome Y, and you have two groups A and B, and the individuals differ between the two groups. And within each group you have a repeated measurement of the same individuals regarding two different conditions C and D? In this case why not using a mixed ANOVA via the ID-variable? Which software do you use?