remove merge conflicts
add ogone tests