Projects >> atlas-model >>c71d5ebb392da6b213a6715a4d4f6d30e2d8c08b

Chunk
Conflicting content 
        SERIES_EDITOR("series_editor", "Series Editor"),
        SERIES_PRODUCER("series_producer", "Series Producer"),
        WRITER("writer", "Writer"),
<<<<<<< HEAD
        ADAPTED_BY("adapted_by", "Adapted By"),
=======
        PRESENTER("presenter", "Presenter"),
>>>>>>> 816a2e595ae6036f53dd00040825d47f9fa95410
        ACTOR("actor", "Actor");
        
        private final String key;
Solution content 
        SERIES_EDITOR("series_editor", "Series Editor"),
        SERIES_PRODUCER("series_producer", "Series Producer"),
        WRITER("writer", "Writer"),
        ADAPTED_BY("adapted_by", "Adapted By"),
        PRESENTER("presenter", "Presenter"),
        ACTOR("actor", "Actor");
        
        private final String key;
File
CrewMember.java
Developer's decision
Concatenation
Kind of conflict
Enum value