Sample modified to test conflicts
Merged