Apparently a merge got attempted...