Fix other merge bug