Remove branch
The difference between this branch and the trunk was a mess. Better to remove the branch and create a new one.