test to figure out merge conflict issue