Recovered a fucked up merge