fix git-merge auto-generated symbols