my code
merged code