Fixed another merge bug