fixed the merge remains