adding all
merged