We will never merge, unless Gogs gets merged into Gitea. We won't merge into Gogs because then only one person will be left as an owner which was the reason for the fork in the first place.