my new channge
CONFLICT RESOLVED