Merge conflicts for Dan