merging problem again