merge refixed