fix ui and a little merge bug