Remove conflict

Change-Id: I17b9dbe662c90ca87b499ee62897c506774c9a23