merge test / conflict