sorry kernle conflict

Signed-off-by: masterajay <sahoo.ajaykumar@gmail.com>