Add getters and setters; enhanced comment format
Handle merge conflicts