modifying conflicts
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master