Projects >> arcbees-website >>db99ddd4dbe7c18db65412534b76325f6fb55390

Chunk
Conflicting content 
        String languageLogo();

        String gquery();

<<<<<<< HEAD
        String chosenHolder();
=======
        String btns();

        String collapsible();
>>>>>>> 1419ab926667ec4e40bc06653ab98290ea0905c8
    }

    @Source("img/products/jukitoGuice.png")
Solution content 
        String btns();

        String gquery();


        String languageLogo();

        String collapsible();

        String chosenHolder();
    }

    @Source("img/products/jukitoGuice.png")
File
PageProductResources.java
Developer's decision
Concatenation
Kind of conflict
Method interface