Solved merge fail.