Merge while pulling (details, no problem)
wassupDB.java database version changed