fixed the merge