fix minor merge bug