Test commit to produce conflict