Solved conflict

Change-Id: I851be4b584afbdb8e80e9de4e749ca708abea094