If you look at the commit list there are commits from 5th of February authored by me about the support of universal links, but based on the title of this pull request there is no relation between this and the creation of the internal link.
There is no conflicts with the current branch but this is because you are trying to merge the same commits and obviously it shouldn't generate any conflict at all.
In order to be able to perform the code review we need to clean up the commit history and keep only the ones you performed.
If you look at the commit list there are commits from 5th of February authored by me about the support of universal links, but based on the title of this pull request there is no relation between this and the creation of the internal link.
There is no conflicts with the current branch but this is because you are trying to merge the same commits and obviously it shouldn't generate any conflict at all.
In order to be able to perform the code review we need to clean up the commit history and keep only the ones you performed.