Make the merge easier