No more fucking merge commit