Merge problem...