Fixed merge failures