removing none needed columns part in CATS-1097 issue
Fix CATS-1101 Updating annual plan management permission
merging
connection string resolve conflict