Adding changes to files to include enums
Fixing conflicts
adding enums