Fix merge failures