Merge conflicts and test fallout