making the merge easier