Fixed the Enum file merge confict I had - trev