Merge woes...