Conflic Changing Test

A test for changes causes confilc