added comments
merge