resolved comment
merge