correction merge fail