final merge for the merge conflicts