# Conflicts: # src/USER-YAFF/pair_lj_switch3_coulgauss_long.cpp # src/USER-YAFF/pair_mm3_switch3_coulgauss_long.cpp