MARINA COMMITING TO CHANGE BRANCH
conflict study related modifications