fix merge bug 2