fix merge reject

Change-Id: I72c8370ef6f3142c4fd2e15fc0fbc78e78c7dc49