adding enum and removing sessions
merging and resolving conflicts