more debug and fix merger