merge conflicts fix

Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>