asserts
merge master