Projects >> atlas >>bafa4970ca2b099e6ca7c4446adc2c2c546df69c

Chunk
Conflicting content 
        simpleModel.setLive(broadcast.getLive());
        simpleModel.setPremiere(broadcast.getPremiere());
        simpleModel.setNewSeries(broadcast.getNewSeries());
<<<<<<< HEAD
        simpleModel.setChannel(simplify(channelResolver.fromUri(broadcast.getBroadcastOn()).requireValue(), annotations));
        
=======
        simpleModel.setAliases(broadcast.getAliases());
>>>>>>> 0700a8d203f6f8372254fefeb46f664c6c30d5af

        return simpleModel;
    }
Solution content 
        simpleModel.setLive(broadcast.getLive());
        simpleModel.setPremiere(broadcast.getPremiere());
        simpleModel.setNewSeries(broadcast.getNewSeries());
        simpleModel.setChannel(simplify(channelResolver.fromUri(broadcast.getBroadcastOn()).requireValue(), annotations));
        simpleModel.setAliases(broadcast.getAliases());

        return simpleModel;
    }
File
ItemModelSimplifier.java
Developer's decision
Concatenation
Kind of conflict
Method invocation