Successfully merged using git cli, not sure why gitea never updated to show a workable merge
rewrote the website, good fix
Please note that blocking a user has other effects, such as: