trying to get the fucking merge