# Conflicts:
#	src/execution/executor_delete.h
#	src/execution/executor_insert.h
#	src/execution/executor_update.h
#	src/parser/yacc.tab.cpp
#	src/parser/yacc.tab.h
#	src/record/rm_file_handle.cpp
#	src/record/rm_file_handle.h
#	src/recovery/log_recovery.cpp
#	src/recovery/log_recovery.h
#	src/rmdb.cpp
#	src/system/sm_manager.cpp

Update file test_for_merge

See merge request T202410487993342/db2024!3

Use ours
# Conflicts:
#   test_for_merge