Sampling features em

This is a test.  I thought I resolved all conflicts, but for some reason it seems that GitHub isn't seeing everything that I did.