# Conflicts: # monitor-ui-ctrl/pom.xml
# Conflicts: # monitor-ui-web/src/main/webapp/jsp/dashBoard/dashBoard.jsp
