Conflict Resolver for Merging branch

[Nirvann]

I am trying to merge two version of same file, one from trunk and other one
from branch using the netbeans conflict resolver. Actually I want code from
both the files to be there in the merged file. How can I do this.

regards,
nirvan.