Fix merge probs

Signed-off-by: GuneetAtwal <harjinder767@gmail.com>