conflict removal

Change-Id: I7ada02eb572c7b44d615cfd68780daee641fbf52