merge woes