deleted some comments
merge