another merge conflict issue