resolved conflicts

Change-Id: Id03cb80c6727068a866ac9d2fb6f09bea1fa3eda
Another change

Added a new sop

Change-Id: I9cd8bc5b23d44a73d47334e927612b52a939f55f