@nprofile1q... Merge is fine, you may have less trouble than with rebase.