Remove conflict markers and fix entries for revision 109836.