correct merge problem