Removed commented lines in conflict_resolving.cc.
Removed unused pool_diskmgr_action_t::backtrace variable.
Made page_map_t use infinite_array_t.