test merge issues