Database Fixed. Main.java is a temporary class to test the database
fixed merge conflict