removed merge fail