Added myself and Digvijay
Fixed conflicts. Removed duplicate Digvijay