some comments and checking
merge conflict