Removed unnecessary assertion
Fixed conflicts