removed comments
merge