Resolving conflict

Signed-off-by: Dileep Mishra <mishradileep@gmail.com>