final fixes of the merge conflict