fixed merge error and bug