modified
merged solved