ADDED CONFLICT ADDED CODE IMAL
merged