events done
merged the changes