Updated test to resolve conflict from merging