misc: fix merge trail and some css