test and fix on merge