NOTICKET: Fix merge issues caused by tool

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
2 files changed