Merge ubuntu into apt