test and fix merge