Update DB.java

resolve conflict from web.