Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

     1

{header}

     2

{dentries%manifestdirentry}{fentries%manifestfileentry}

     3

{footer}