Fix error in merge