made some comments
merge conflic