popall
fixed merge problems