correcting problems during git merge

Change-Id: I525e46f326ef740997fe3d7d8720832aad75a303