swat conflict

Change-Id: Ibb9040c3bbe67c466ad065a99ffb427e85382bfb