testing OBJECTHASH
Fix conflicts