Fix small merge bug