added D from vinay
Resolve Conflict