Test to figure out merge conflict