# Conflicts:
#	src/common/config.h
#	src/execution/execution_load_data.h
#	src/execution/execution_manager.cpp
#	src/execution/executor_delete.h
#	src/execution/executor_insert.h
#	src/execution/executor_seq_scan.h
#	src/execution/executor_update.h
#	src/parser/yacc.tab.cpp
#	src/parser/yacc.tab.h
#	src/record/rm_file_handle.cpp
#	src/recovery/log_recovery.cpp
#	src/rmdb.cpp
#	src/storage/buffer_pool_manager.cpp
#	src/transaction/concurrency/lock_manager.cpp
#	src/transaction/concurrency/lock_manager.h
#	src/transaction/transaction_manager.h