Going through a very painful AccuRev merge process… my colleagues promoted code that collides with my Enum definitions and admin UI layout