Fix conflicts with patch

Signed-off-by: Geetesh Kalakoti <kalakotig@gmail.com>