add meteor
merge