fixing conflicts

Change-Id: I23933519004031d56f6e3350b80e622afeeff105