wierd merge problem