fixed merge display bugs