# Conflicts: # src/main/resources/static/real_control_v2/main.html
# Conflicts: # src/main/resources/ms-jdbc.properties