conflict resolution?
??
Merge branch 'master' into TD_noy
deleted enum class...not needed