Fix merge fail