# Conflicts:
#	etc/config.yaml
#	src/oai_upf/CMakeLists.txt
#	src/oai_upf/main.cpp
#	src/pfcp/3gpp_29.244.cpp
#	src/pfcp/3gpp_29.244.hpp
#	src/pfcp/msg_pfcp.hpp
#	src/upf_app/bpf/rules/include/pfcp_session_lookup_maps.h
#	src/upf_app/simpleswitch/CMakeLists.txt
#	src/upf_app/simpleswitch/pfcp_pdr.cpp
#	src/upf_app/simpleswitch/pfcp_switch.hpp