merged correctly