Fix the broken 777 merge