fixed unsuccessful merge bugs