Manual merge fail fixed