Projects >> atlas-persistence >>6952a637e0d5d59fe1a8880206101737dca6b1e2

Chunk
Conflicting content
            if (parent == null) {
            	Container brand = item.getContainer();
				if (brand != null) {
<<<<<<< HEAD
            		Identified dbContent = findByCanonicalUri(brand.getCanonicalUri());
            		if (dbContent instanceof Container) {
            			Container dbContainer = (Container) dbContent;
            			if (!dbContainer.getContentUris().contains(item.getCanonicalUri())) {
            				dbContainer.addContents(item);
            				updateBasicPlaylistDetails(dbContainer, contentCollection);
=======
            		Content dbContent = findByUri(brand.getCanonicalUri());
            		if (dbContent instanceof Brand) {
            			Brand dbBrand = (Brand) dbContent;
            			
            			if (!dbBrand.getItemUris().contains(item.getCanonicalUri())) {
            				dbBrand.addItem(item);
            				updateBasicPlaylistDetails(dbBrand);
            			} else {
            				dbBrand.addItem(item);
>>>>>>> 98978bd4e398e9c8dd394598a1902da9f036e9b6
            			}
            		} 
            	}
Solution content
            if (parent == null) {
            	Container brand = item.getContainer();
				if (brand != null) {
            		Identified dbContent = findByCanonicalUri(brand.getCanonicalUri());
            		if (dbContent instanceof Container) {
            			Container dbBrand = (Container) dbContent;
            			if (!dbBrand.getContentUris().contains(item.getCanonicalUri())) {
            				dbBrand.addContents(item);
            				updateBasicPlaylistDetails(dbBrand, contentCollection);
            			} else {
            				dbBrand.addContents(item);
            			}
            		} 
            	}
File
MongoDbBackedContentStore.java
Developer's decision
Manual
Kind of conflict
Cast expression
If statement
Method invocation
Variable