introduce another merge conflict