Added select by package uri to Database.java
Fixed merge conflicts