added more comments
merge