fixed another merge issue

Author: Steve Briskin

src/main/com/mongodb/DBCollection.java

@@ -883,11 +883,7 @@ public long getCount(ReadPreference readPrefs){
      *  calls {@link DBCollection#getCount(com.mongodb.DBObject, com.mongodb.DBObject)} with null fields.
      *  @param query query to match
      *  @return
-<<<<<<< HEAD
-     * @throws MongoException
-=======
      *  @throws MongoException
->>>>>>> JAVA-570
      */ 
     public long getCount(DBObject query){
         return getCount(query, null);