update
fix merger