Fixed conflicts

Signed-off-by: sriharsha <helpzuna@gmail.com>