resolve merge conflict

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>