fix the merge stuff