merge fun
merged