fixed the merge stuff