Nothing merged, the files had merge conflicts. Should have resolved before the last conflict.