Fixed merge fail