fix merged code. causes compiling errors

Change-Id: I641626da43b0b709ff0de69f7315ff6fb3aab654