some little work
merge