Rob's first conflicting change test

@avaliani Check this out